From d09f66579b89792395febd0608d3d5a8ca31d362 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 22 Nov 2014 20:13:26 -0500
Subject: [PATCH] inspector: Show object title in data tab

---
 gtk/inspector/data-list.c  | 17 +++++++++++++----
 gtk/inspector/data-list.ui | 28 ++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/gtk/inspector/data-list.c b/gtk/inspector/data-list.c
index 4ed9ee1104..4b4b0dd88c 100644
--- a/gtk/inspector/data-list.c
+++ b/gtk/inspector/data-list.c
@@ -22,13 +22,16 @@
 
 #include "gtktreeview.h"
 #include "gtkcellrenderertext.h"
-#include "gtktoggletoolbutton.h"
+#include "gtktogglebutton.h"
+#include "gtklabel.h"
+
 
 struct _GtkInspectorDataListPrivate
 {
   GtkTreeModel *object;
   GtkTreeModel *types;
   GtkTreeView *view;
+  GtkWidget *object_title;
   gboolean show_data;
 };
 
@@ -111,6 +114,8 @@ void
 gtk_inspector_data_list_set_object (GtkInspectorDataList *sl,
                                     GObject              *object)
 {
+  const gchar *title;
+
   clear_view (sl);
   sl->priv->object = NULL;
   sl->priv->show_data = FALSE;
@@ -121,6 +126,9 @@ gtk_inspector_data_list_set_object (GtkInspectorDataList *sl,
       return;
     }
 
+  title = (const gchar *)g_object_get_data (object, "gtk-inspector-object-title");
+  gtk_label_set_label (GTK_LABEL (sl->priv->object_title), title);
+
   gtk_widget_show (GTK_WIDGET (sl));
 
   sl->priv->object = GTK_TREE_MODEL (object);
@@ -129,13 +137,13 @@ gtk_inspector_data_list_set_object (GtkInspectorDataList *sl,
 }
 
 static void
-toggle_show (GtkToggleToolButton  *button,
+toggle_show (GtkToggleButton      *button,
              GtkInspectorDataList *sl)
 {
-  if (gtk_toggle_tool_button_get_active (button) == sl->priv->show_data)
+  if (gtk_toggle_button_get_active (button) == sl->priv->show_data)
     return;
 
-  if (gtk_toggle_tool_button_get_active (button))
+  if (gtk_toggle_button_get_active (button))
     show_data (sl);
   else
     show_types (sl);
@@ -148,6 +156,7 @@ gtk_inspector_data_list_class_init (GtkInspectorDataListClass *klass)
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/data-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorDataList, view);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorDataList, object_title);
   gtk_widget_class_bind_template_callback (widget_class, toggle_show);
 }
 
diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/data-list.ui
index 83d0ca3f9a..44854368ba 100644
--- a/gtk/inspector/data-list.ui
+++ b/gtk/inspector/data-list.ui
@@ -3,15 +3,35 @@
   <template class="GtkInspectorDataList" parent="GtkBox">
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkToolbar" id="toolbar">
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="icon-size">small-toolbar</property>
+        <property name="orientation">horizontal</property>
+        <property name="spacing">6</property>
+        <property name="margin">6</property>
         <child>
-          <object class="GtkToggleToolButton" id="show_button">
+          <object class="GtkToggleButton" id="show_button">
             <property name="visible">True</property>
-            <property name="icon-name">view-refresh-symbolic</property>
+            <property name="relief">none</property>
             <property name="tooltip-text" translatable="yes">Show data</property>
             <signal name="toggled" handler="toggle_show"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">view-refresh-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack-type">start</property>
+          </packing>
+        </child>
+        <child type="center">
+          <object class="GtkLabel" id="object_title">
+            <property name="visible">True</property>
           </object>
         </child>
       </object>
-- 
2.30.2